Merge from emacs-24; up to r111280
authorGlenn Morris <rgm@gnu.org>
Tue, 19 Feb 2013 03:29:28 +0000 (19:29 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 19 Feb 2013 03:29:28 +0000 (19:29 -0800)
commit2558097c16fd7679bc47a4030c56d6c6d9da6b83
tree0734039002fe44024cf1ce668311a85531332668
parent54015cf50080b4a2dc4a63211555d2df5e8fae23
parentc48631500f8f654f132622ce201397827b897850
Merge from emacs-24; up to r111280
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/eshell/em-unix.el
lisp/info-look.el
lisp/net/tramp-sh.el
lisp/progmodes/python.el
src/ChangeLog
src/w32proc.c
src/xdisp.c